bitkeeper revision 1.1236.1.52 (42273792F0NBFkhZz96wi1afyF7_Uw)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Thu, 3 Mar 2005 16:13:06 +0000 (16:13 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Thu, 3 Mar 2005 16:13:06 +0000 (16:13 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
BitKeeper/etc/logging_ok
tools/libxc/xc_plan9_build.c

Simple merge
Simple merge